ms and bib changes
Merge branch 'master' of github.com:rmaia/pavo