HomeDevelopment

Revert "Revert "Merge pull request #203 from Aiko-IT-Systems/revert-196-dcs…