Closes #71