Bug fix
Bug fix
Bug fix
Removed commandline option
Updated XML generation