Merge pull request #2 from 90max/maximilian

Maximilian
Merge branch 'master' of https://github.com/90max/HITCH