Merge pull request #327 from learn-more/next

Split headers and source in CMake