Merge pull request #155 from apache/patch_for_rc4

Apply changes to create rc4