Adding the rest of the original files.
Merge remote-tracking branch 'origin/master' into develop
Merge pull request #2 from wes1es/develop

Develop