Update Formo - two bugs fixed, patches pushed upstream to the Formo project.