Merge pull request #7 from StevenEBarbaro/master

grabbing upstream
Merge pull request #8 from StevenEBarbaro/master

grabbing upstream
Much needed cleanup.
Merge pull request #5 from cbebry/master

Pushing up much needed cleanup.