Merge branch 'dev' for release 0.1.3
Merge branch 'dev'
Merge branch 'dev'
Changes for 0.1.4
Merge branch 'master' into dev