Merge branch 'master' into develop

Bringing develop inline with master.
Brought back grave accents that were replaced with apostrophes.
Merge branch 'hotfix/grave-accent-vs-apostrophe' into develop
Merge pull request #12 from Hornswaggler/develop

Merge Develop