Fixing the support for number values
Merge remote-tracking branch 'github/i2b2-hackathon' into i2b2-hackathon