Fixed the nullPlayer problem.
Merge branch 'master' of https://github.com/peruginim/ProjectAtom