Merge pull request #25 from Magenic/master

Merge from Main
Merge pull request #100 from Bowman74/master

Merge pull request #25 from Magenic/master