fixed bug
Merge branch 'master' into r2_index
added x
master added y
resolved conflict