Fix for issue #324
Merge branch 'samuelhorwitz/issue324-touchcancel'