Merge pull request #33 from spderosso/model

Some small changes