Re-enable touch efp optimization for simple case
Merge pull request #107 from azakus/master

Re-enable touch efp optimization for simple case