Updated machado.
Merge branch 'develop' of github.com:johnshopkins/jhu.edu into develop