fix error in QTkCanvas, fix #111
Merge pull request #1 from dmichiels/master

fix error in QTkCanvas, fix #111
Merge pull request #1 from mozart/master

Merge upstream