Merge pull request #187 from fsb4000/Qt