Fixes #238
Merge branch 'CNC1' into CNC2
Fixes #226
Merge branch 'CNC2' of github.com:/cuyum/FormRender into CNC2