Merge pull request #55 from alainmarcel/alainmarcel-patch-1

Full conversion to cmake