Fix #71
Merge pull request #72 from MengZhang/develop

Fix #71