Merge pull request #3 from apache/master

Merge from apache