Merge pull request #9 from tfrank64/master

Clean up and multi-touch fix.