Fix #359.
Fixed #376
Merge branch 'master' of github.com:FreezingMoon/AncientBeast