yotam: bug fixes in data.
Merge pull request #49 from yotammanor/newmodel

yotam: bug fixes in data.