Dev
Merge pull request #1 from thamhoa/master

Dev Update