Bump version & rework generator stuff. Much cleaner now, and fixes #2