Added configuration file and some changes