Merge changes.
Merge branch 'master' of https://github.com/uglycustard/buildergenerator.git
Fix typos, improve README