Closes #95