Closes #99