Merge pull request #80 from chuanweizhang2013/develop

Develop
fixed release