Merge pull request #1 from iYalovoi/master

Update from original