Merge pull request #63 from CarrieRider/Dev

Dev
Merge pull request #44 from TatyaniaM/Dev

Dev