some changes
Merge branch 'matt'