Merge pull request #7 from apache/update

update code