Merge pull request #1 from jerrywang1981/dev

Dev update from jerrywang1981
Created by Zhang Xin Peng
Merge pull request #5 from zhangxinpeng/dev

Dev