few changes recomm. by m. faath
Forgot to push changes at work
Merge branch 'master' of https://github.com/personalunion/QDev