Merge pull request #1 from AlexDenisov/master

Mods by Alex