Added int x.
Added double y.
Updated master