Update
Merge pull request #1244 from ilyar/master

Update