Merge pull request #29 from forrestbthomas/master

fix(public): Fix merge conflicts
Merge pull request #30 from forrestbthomas/master

fix(public): Merge
docs(readme): Update readme