Merge pull request #1078 from Diapolo/QR-Code