Cam py

Merged latest changes