Merge pull request #1 from dgianotti/master

updating my repository
updating
Merge pull request #4 from AngelaRigden/master

updating my repository