Issue 31

Closes #31