cut locale
Merge branch 'issue-23' into develop