Merge pull request #17 from thayanban/thay

Merge pull request #16 from thayanban/master
Merge pull request #18 from thayanban/master

Merge pull request #17 from thayanban/thay