Issue 5

Fixes #5