Merge pull request #2 from rockzill/master

Слияние
Merge pull request #3 from vsimanin/master

Merge pull request #1 from rockzill/master
Merge pull request #4 from vsimanin/patch-36

Patch 36
Merge pull request #45 from vsimanin/master

Слияние