tweaks
Merge pull request #224 from jpecht/master

tweaks