fix typo in comment
fix t() call
Merge branch 'dev'