Issue/#71

Fixes #71