Applying the changes from my perferred version
Making perfection edits in the dev branch
Merge pull request #1 from gavinwhurley/dev

Dev