Merge pull request #3 from framgia/develop

Develop
Merge pull request #4 from framgia/master

from master