Merge pull request #2 from CVerhoosel/master

Fix to data types