tweaks
Merge pull request #85 from marsmith/master

tweaks