Version 0.9
Merge branch 'dev'