Closes #102