Merge pull request #57 from apache/misc