flex unit updates
Merge branch 'master' of https://github.com/chrismlusk/OCR-phase2