Merge branch 'hotfix/0.5.5'
Update the version number
Merge branch 'hotfix/0.5.6' into develop