think this is it
Merge pull request #3 from mesmichael/master

think this is it