Merge pull request #122 from intellix/feature/touch-delay