Added cpe feauture

I hope it is useful for you as it is for me