Merge pull request #27 from Magenic/master

Merge from main