Merge pull request #1 from ais-dwong/develop

Develop
hotfix timeout
Merge branch 'hotfix/fix_timeout' into develop