Rewrote the generator
Merge branch 'master' of github.com:GeeH/UglyDi