Merge pull request #25 from Magenic/master

Merge from Main