Fix for issue #538
Merge pull request #539 from jgdovin/master

Fix for issue #538 owner protection of grave