Fixing implicit merge conflict of Light re-factoring and ChainLight
Merge pull request #27 from rinold/master

Fixing implicit merge conflict of Light re-factoring and ChainLight