Merge pull request #2 from tagia0212/feature-light

Feature light
Merge pull request #3 from tagia0212/develop

Merge pull request #2 from tagia0212/feature-light