Fixed #794
Merge branch 'fixNameTags' of https://github.com/esteldunedain/AGM.git into fixNameTags