Merge branch 'dev'
update readme