changes by Rebecca
Merge branch 'master' of https://github.com/DiegoVallely/sgc