Make return values prettier for mafia
Merge pull request #944 from MJB47/mafia

Make return values prettier for mafia
fix crash in mafia
Merge pull request #945 from MJB47/mafia

fix crash in mafia
Merge remote-tracking branch 'upstream/master'