Fixed issue with non-initialized fields
Merge branch 'master' of https://github.com/ErikOnBike/light-play