Fix #436
Fix #548
Merge branch 'master' of github.com:FreezingMoon/AncientBeast