Fixed client crash. #113
Merge branch 'master' of https://github.com/manicdigger/manicdigger