changed light stuff
Merge origin/master