Fixes

Potential fixes for the objects not working in the console.
Merge pull request #8 from ppicinic/Models

Fixes