test loction on the model
Merge branch 'master' into ted