added #value
Merge branch 'dev'