U2: bug fix and performance imrovement.
U2: bug fix and performance imrovement.

jlhughes/foam,mdittmer/foam,foam-framework/foam,jlhughes/foam,jacksonic/foam,foam-framework/foam,jlhughes/foam,mdittmer/foam,jacksonic/foam,foam-framework/foam,jacksonic/foam,jlhughes/foam,foam-framework/foam,mdittmer/foam,foam-framework/foam,jacksonic/foam,mdittmer/foam