Update makefile
Update canossa
Merge branch 'develop'
Fix a few PEP8 compliant issues
More fix for PEP8 compliant