Fixes #300
Merge branch 'CNC2' of git@github.com:/cuyum/FormRender into CNC2