remove dup code
Merge branch 'dev'
read me again