Merge pull request #1 from Qt-dev/develop

A lot of small fixes
Merge pull request #3 from Qt-dev/master

Merge pull request #1 from Qt-dev/develop