Merge pull request #7 from courtf/master

Refactors. Fixes #4.
update readmes