Updated old README
Merge branch 'dev' into ms