Issues/3

Fixes #3