Merge pull request #2 from rdobrynin/master

merged