Ultimi fix fatti

Signed-off-by: Lorenzo Pagliari <lorenzo.pagliari@hotmail.it>
Merge branch 'master' of https://github.com/lorenzo-pagliari/HA