Improved model referencing
Merge pull request #1 from FaKeller/master

Improved model referencing