Fix #2
Merge pull request #5 from MengZhang/develop

Fix #2