Attempts at fixing segfault
Merge branch 'ultimaterisk' of github.com:bpa/gamed into ultimaterisk