This fixes #17 and also resolves #17, closes user/repo#17