Merge pull request #3 from johnwfoley/test

added test file
no
Awesome changes
john stuff
other stuff
slightly less awesome