forms improved (dataType)
Merge remote-tracking branch 'mach/master'