Merge pull request #27 from Magenic/master

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

Merge pull request #27 from Magenic/master