Bumping development version
Merge branch 'master' into develop
Bumping version for release of 0.5.5
Updating changelog for versions 0.5.2-0.5.5