Closes #60