Closes #117