Fixed some things.
Merge branch 'master' of https://github.com/ds84182/CCLights2