Bug fix
Merge pull request #11 from ivanzhaowy/master

Bug fix