Merged cipy-master