Merge pull request #8 from sbromberger/master

Update / correct README.md
Merging with recent changes
Merge remote-tracking branch 'upstream/master' into no-imports