Fix #336
Fix  #348
Merge branch 'master' of github.com:FreezingMoon/AncientBeast