Merge pull request #12 from chin-andrew/master

Fixed QR Scanner crash on 'back'; tidied up