Bug fix and new config file