new model branch
Merge pull request #5 from uh-joan/models

Amir minor changes to base