Fixes and closes gh-1