Merge pull request #5 from apache/update-code

update code