Merge pull request #522 from art-zhitnik/master