Fixed some issues
Merge branch 'master' of https://github.com/matthijs2704/GraniteHome