Closes #34