Clean up a couple of bugs
Bump version number
Merge release

* release-0.5.6:
  Bump version number