Merge pull request #582 from Shulyaka/master