configuration fixes
Merge pull request #107 from rezso/master

configuration fixes