merge hotfix 0.3.1
merge