Merge branch 'dev'
Release 0.5.1
Bump to 0.5.2-SNAPSHOT