Merge pull request #1 from vslavik/master

Update