Merge pull request #2 from Project-Loremaster/Development

Merge pull request #1 from Project-Loremaster/master