Fix crash
Merge branch 'master' of https://github.com/larcus94/HackZurich