Fixed language issue
Merge branch '2.0'