Merge branch 'master' of github.com:gutschep/lensedQD into philipp

gutschep forgot to pull master early enough