merge
Merge branch 'master' of github.com:hplgit/scipro-primer
merge
updates