Closes #82