Merge pull request #550 from mjanda/master