Added int x.
Added double y.
Added int x.
Merge branch 'feature1'