Fixed segfault
Merge branch 'master' of https://github.com/neagix/smw-next