Fixed indentation of generated files and added support for extra paths.
Deprecated the use of underscores in options.