merge UAT 3.4.0.pre version to master
Merge pull request #148 from ke4/merge_uat_3.4.0.pre

Merge UAT 3.4.0.pre
Travis build has passed.