Merge branch 'release/1.0'
fix name
Fixin directive
uprev