Merge pull request #5 from apache/review

Review