COnfiguration tool finished, fixes #47
Merge Configuration tool