Issue 3

Fixes #3