Dev

Updating master for barcodes.