Merge pull request #1 from ptlis/master

Epic re-factor with Brian!
Update README.md