Closes #30
Merged