Fix a reference error
Merge branch 'develop' of git://github.com/saitoha/canossa into develop
Merge github.com:saitoha/canossa into develop
Fix for PEP8 compliance
Additional fix for PEP8-compliance
Merge branch 'develop'