Merge pull request #5 from apache/master

Merge pull request #4 from apache/dev