Merge pull request #104 from phuonghuynh/master

Fix issue when doing deploy
Merge commit 'cd6587932949daef5ca7079fdc24f16ec7454bf1'