Merge pull request #1 from nvuphong/DevBranch

Dev branch