trying to get things to work again
Merge branch 'master' into chris
merging some changes