Changes due to review comments

Signed-off-by: Oliver Libutzki <o.libutzki@external.telekom.de>
Merge branch 'master' of https://github.com/qivicon/smarthome

Signed-off-by: Oliver Libutzki <o.libutzki@external.telekom.de>
Adjustments due to review comments

Signed-off-by: Oliver Libutzki <o.libutzki@external.telekom.de>