Merge branch 'hotfix/0.3.1'
Required by dist
Merge branch 'release/0.4.0'
merging release0.5 into local master, resolving tiny conflict before pushing
trying to finish the damn release0.5. What is up with this tagging bs