Merge pull request #995 from marek22k/master