Minor fix
Merge branch 'develop' of git://github.com/saitoha/canossa into develop
Update termprop
Fix a reference error
Merge branch 'develop' of git://github.com/saitoha/canossa into develop
Merge github.com:saitoha/canossa into develop