update
Merge pull request #4 from evanf/master

update by fengyifan