Small fixes
Several fixes
Merge pull request #67 from Elao/touch

Touch