Merge pull request #38 from Magenic/master

Merge from main.