Fixed help doc for encoding options
Merge branch 'dev' into ms