Fixed stupid segfault
Merge branch 'master' of github.com:rhaps0dy/meCh