Merged mods and fixed changelog
Merge pull request #328 from GrygrFlzr/master

Merged mods and fixed changelog