Merge branch 'master' of github.com:daniel86/regen