fixed
Merge pull request #148 from georgebyelas/master

Fix compilation errors + update data model