more tweaks
Merge pull request #13 from ckamsler/master

more tweaks