Merge pull request #576 from mjanda/master