Bugfix - typo in variable name
Code cleanup and reorganization
Merge remote-tracking branch 'upstream/master'
Merge pull request #9 from tjchambers/master

Code cleanup and bugfix for Barcode modules