Add comment and fix error case bug
Merge branch 'lang'