change data model #28
Merge pull request #9 from avetisk/iss28

change data model #28