Closes #110