from Jacky branch
Merge pull request #1 from nguyenshane/Jacky-branch

from Jacky branch