Closes #104