Merge pull request #18 from Bkahler/master

Tweaks