Merge pull request #31 from azakus/master

FIx missing touchend, code cleanup