Light generator

merge light-generator to master