working on the new linear models.
Merge branch 'origin/master'