Still need to combine the models in the Admin.
Merge pull request #3 from Ateoto/issue2

Merging issue2 changes into master