Fix/97

Fixes #97