Final version updated to Gradiance.
Merge origin/master