Version 0.1.4
Merge branch 'dev'