Fix Github link in readme
Merge branch 'dev'