closes GH-5, closes GH-6