Cpp doodle

Please pull my branch and merge it with the master