Merge pull request #4 from mikecao/master

update