Merge pull request #3 from LudziE12/magik6k

Merge pull request #2 from LudziE12/master