#250 doc correction
Merge branch 'dev' into ms