Closes #116