Doing work...
Merge pull request #6 from travisfischer/master

Making tweaks