bugfix
Merge branch 'master' of github.com:zinroc/zinrocfantasy