Fixes and closes gh-2.