Bug fix
Merge pull request #4 from ivanzhaowy/master

Bug fix