bug fix
Merge pull request #69 from MengZhang/develop

bug fix