Trying to find where the problem is
Merge branch 'master' of https://github.com/sunian/smash