Commit to support dev
Merge pull request #36 from phuonghuynh/master

Commit to support dev