Fixed indention
Added options to disable auto config of bundles