Doc addition for #227
Merge branch 'dev' into ms