Merge branch 'master' of git://github.com/saitoha/canossa
Merge branch 'develop'
Merge github.com:saitoha/canossa
Additional fix for PEP8-compliance
Merge branch 'develop'
Impliment cliping drawing
Minor fix