Fix #51
Merge pull request #52 from MengZhang/develop

Develop pull request from meng