Closes #97