Merge branch 'dev'
v0.1.3
Merge branch 'master' into dev