Issue 1

Fixes #1