Merge pull request #2 from bnacey/master

second pull
Clean up