Merge pull request #1 from Shestak/master

Merge Shestak:master