Closes #103