Closes #78