updates to bring in line with master branch
updates to master
Merge branch 'develop'