Modified to accept settings
Included avoid settings file
Settings migrated to external file
Modified to accept settings
Modules updated