Closes #90