Added config.xml and some changes

Commit 2