Issue57

Fixes #57 (and some build issues)