Merge pull request #2 from rdobrynin/master

merged
Merge pull request #3 from rdobrynin/lang

Merge pull request #2 from rdobrynin/master