hotfix-0.3.1 dev to master