Working on lighting (WIP)
Merge remote-tracking branch 'origin/master'