Closes GH-53
Closes GH-57