Merge pull request #37 from yotammanor/newmodel

Fix misconfiguration of project setup