Arch v1.1_01 //Test code fixed
Merge remote-tracking branch 'origin/master'