better code
Merge pull request #24 from Kunstmaan/bugfix/multiconfig-support

better code