basic illumination
updating to merge
Merge branch 'issue_basicIllumination' into devel_c
merge failed, ill try again