Closes #113