Closes #77