Closes #75