Merge pull request #11 from Magenic/master

Merge from main
Merge pull request #42 from Bowman74/master

Merge pull request #11 from Magenic/master