Merge pull request #12 from apache/fixes

Fixes