merge cmake -> master

Pull this to merge cmake configuration