Update Monsters form master

Updated with latest changes form master