Issue57

Fixes #57