a few cleanups
Merge remote-tracking branch 'upstream/master'
Merge pull request #108 from Ventrella/master

a few small tweaks