Merge pull request #36 from KellyBlack/Dev

Dev
Merge pull request #35 from CarrieRider/Dev

Dev
Merge pull request #37 from CarrieRider/Dev

Dev
Merge pull request #26 from TatyaniaM/Dev

Dev