Merge pull request #5 from jsuich/master

Take it bitches
Merge pull request #6 from jsuich/Models-Migration

Merge pull request #5 from jsuich/master