Issue/#69

Fixes #69