Merge pull request #3 from MarcSpicker/master

Data Model finished
Finally closure :D
Merge pull request #1 from enplotz/datamodel

Data model typo