#230 addressed errors found by Liz in comment 11 in ticket
Merge branch 'ticket#230' into po_ready