0.0.21

+ fix version number
Merge branch 'dev'