Merge pull request #163 from drizt/master

qt5 fix
Merge pull request #164 from drizt/master

fixed Qt5 compilation