Merge release 0.1.9
Merge branch 'master' into dev