did shit
dammit schema
Merge pull request #96 from MarwanNakhaleh/develop

did shit