fix bug2 on feature3
Merge branch 'feature3' into develop
Merge pull request #1 from ais-dwong/develop

Develop