Merge pull request #58 from amandagroccia/dev

Dev