Merge pull request #11 from Magenic/master

Merge from main