improve function
Merge branch 'FormFieldSolution' of https://github.com/porter1130/Analogic into FormFieldSolution