Closes GH-270
closes GH-262