Fixes null values
Merge pull request #40 from rjbernaldo/changeschema

Fixes null values