Merge pull request #161 from jdolan/master

Low hanging fruit
Merge remote-tracking branch 'upstream/master'