Merge pull request #37 from Magenic/master

Merge from main.