Merge pull request #1 from astirpe/master

Minor source improvements