add const
Merge branch 'chin'