Added Code Review comments
Merge branch 'master' of https://github.com/gergelydezso/SmartLampProject
Added Code Review comments