Merge pull request #48 from amandagroccia/dev

Dev