tweaks
Merge pull request #1 from eballot/master

tweaks