Update on 2014-4-21
Merge pull request #5 from szszss/develop

v0.3 hotfix