Merge pull request #28 from ke4/uat

Merge the changes from DEV branches (1.0.3)