Added doc for #250
Merge branch 'dev' into ms