Race fix + enhanced datatype test
Merge pull request #80 from joaquincasares/trivial_changes

Race fix + enhanced datatype test