HomeDevelopment

Merge pull request #223 from Aiko-IT-Systems/enhancements