barcode scanner Fixes
Merge pull request #580 from sandal-smuggler/Bracode-Scaner-Fix

barcode scanner Fixes