Merge branch 'master' into dev
v0.3.1 with a small fix