Merge pull request #25 from gabi2/master

save configuration on Finish (issue #11)