Merge pull request #35 from apache/issue34

Issue34