Merge pull request #1 from simplecrypto/0.6.1-dev

0.6.1 dev
Merge pull request #2 from sbwdlihao/master

Merge from master
fix general_05 bug
Merge pull request #4 from sbwdlihao/0.6.1-dev

0.6.1 dev