Merge pull request #71 from pnagy/master

integrate configuration into gui