Issue 13

Closes #13