Merge branch 'dev'
test edit readme
remove 7 on dev