HomeDevelopment

Merge pull request #162 from Aiko-IT-Systems/cleanup/optimize