Closes #37