Merge branch 'master', remote-tracking branch 'origin'
Reviewed Luis' changes and made some small ones of my own