Added int x.
Merge branch 'Willard24_master'
none