Merge pull request #20 from jewel/master

Minor first-time build improvements