Merge pull request #38 from Magenic/master

Merge from main.
Merge pull request #153 from Bowman74/master

Merge pull request #38 from Magenic/master