merge UAT 0.8.0.pre to master
Merge pull request #20 from ke4/merge_uat_0_8_0_pre_to_master

merge UAT 0.8.0.pre to master