Merge pull request #47 from CarrieRider/Dev

Dev
Merge pull request #33 from TatyaniaM/Dev

Dev