Issue/#68

Fixes #68