Merge pull request #1 from Holicore/master

Upstream Merge
Second Test
Merge pull request #2 from McDonnellDean/second-test-feature

Second test feature