Closes #243
Merge branch 'CNC2' of github.com:/cuyum/FormRender into CNC2