made public as necessary
Merge branch 'master' of https://github.com/royan367/NoTouch
bug fixes