Merge pull request #46 from Magenic/master

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

Merge pull request #46 from Magenic/master