Merge "modify for licence" into 2.0_beta