Updated to newer version of cl.hpp