Merge pull request #410 from maz-1/master