Release 0.1.3
Merge branch 'master' into develop