Merge pull request #34 from TatyaniaM/Dev

Dev
Merge pull request #35 from TatyaniaM/Dev

Dev
Merge pull request #31 from CarrieRider/Dev

Dev