Patch Issue #17 bug in 2.0
Ported DataType classes