Merge pull request #1014 from danrl/datatypes