Heroes grave master

Merge