Closes #30