Merge pull request #404

Changes to support CMake FetchContent