Bug - segfault fix
Merge branch 'master' of https://github.com/LukasSukenik/faunus