Closes #98