Closes #108