bug fix
Merge pull request #70 from MengZhang/develop

bug fix