Version 0.10
Merge branch 'dev'