Rolled back some changes, added Relationships
Merge pull request #20 from benjaminpaap/master

Rolled back some changes, added Relationships