New tagging
Edited the word version
More tagging
Merge branch 'develop'