more fun things
Merge pull request #6 from ckamsler/master

more fun things