Merge pull request #1 from qrs/master

major update & refactor
stripping down
vanish from the pilgrims
Merge pull request #1 from bobbygiangeruso/master

testing the waters