Closes #74