fix version
fix bad character
Merge branch 'develop' into tmp