Issue 12

Closes #12