Closes #101