resolves #127 - expanded the form