Modify codes.
Merge branch 'master' of github.com:jeanmahai/ProductComponents