comments
python-qt4
Merge remote-tracking branch 'troubadoour/master'
formatting