Stable 55

* Fixes #59
* Fixes #58