bug fix in touch (again :( )
Merge branch 'master' of https://github.com/willcrichton/mystro