Closes #111