Version 0.1.6
Merge branch 'dev'