Merge branch 'dev'
docs in README