Fixes #27

Finally got there!