Minor fix
Merge branch 'master' of git://github.com/saitoha/canossa
Merge branch 'develop' of git://github.com/saitoha/canossa into develop
Update termprop
Merge branch 'develop'
Merge github.com:saitoha/canossa