Merge pull request #46 from Magenic/master

Merge from main