Issue/#4

Fixes #4