Settings now from config file
README merge conflict