Merge pull request #13 from apache/issue10

Issue10