Merge pull request #21 from gabi2/master

 	improve configuration and services dialog