Closes #193