Merge pull request #88 from marsmith/master

tweaks