Added Configuration UI(not working (yet))
Merge remote-tracking branch 'origin/master'