Refine language
Merge branch 'shayne'