Added  qr-scanning support
merge