Fixed model handler
Merge pull request #32 from lewisay/master

Fixed model handler