Signed off by Juan Ruiz
Merge branch 'master' of https://github.com/ajuanr/RuizJuan_CSC11_48598