DEVIDM-94: Configuring the DS
Merge pull request #80 from iceglow/DEVIDM-131

DEVIDM-94: Configuring the DS