Merge pull request #3 from ShawnStrickland/develop

Merge Develop into Master