Issue/#42

Fixes #42