Merge pull request #502 from ilyashuma/master

merged, thanks