tweaks
Merge pull request #3 from ckamsler/master

tweaks