added parameters to function
removed touchtest
Merge branch 'master' of https://github.com/Therrien-Barley/cowboy