terminology
Merge branch 'master' of github.com:vzaliva/touchsens