A some small cleaning added to the script.
Merge branch 'master' of http://github.com/brushdemon/gen-update