DEVIDM-82: Some configuration changes.
DEVIDM-82: Configuration changes.
DEVIDM-82: Updated tests
Merge pull request #42 from tomma/DEVIDM-82

DEVIDM-82