Closes #114