Closes #79