Refactoring of generators, fix bugs.
Merge branch 'master' of github.com:MaxSvargal/otagai.js