committed to dev2 branch

these changes were made before creating the dev2 branch
Merge branch 'dev2'