Merge branch 'dev'
Adding a few more words, mainly tech-related.
Merge branch 'bugfix/adding-words' into dev