Fix for #357/#331
Add a regression test
Add a comment
Remove test pyqt
Merge pull request #358 from ColinDuquesnoy/dev

Fix for pyqt errors with python 2.7