Merge pull request #1 from ganymedes02/master

Mergey, Merge, Merge
Merge pull request #2 from Vadis365/master

Merge pull request #1 from ganymedes02/master