Merge pull request #173 from fsb4000/Qt