Closes GH-1