Merge pull request #14 from CarrieRider/Dev

Dev