Added x-prop to the demo-listener class.
Merge remote-tracking branch 'origin/master'