Merge pull request #1 from lloydbenson/master

initial PR to start collaboration
Merge pull request #3 from lloydbenson/master

cleanup