Merge branch 'release/0.1.0'
Fixed wrong version number
Merge branch 'hotfix/20130407' into develop