Feature/#5

Fixes #5