Merge branch 'release/0.5.1'
bumping version number
yet ANOTHER freaking _
Merge branch 'hotfix/0.5.1a'
Merge branch 'master' into release/0.5.1