Makefile tweek
Update canossa
Merge branch 'master' into feature_window_management