added proxy settings
Merge branch 'master' into fns038b
Merge branch 'master' into fns038b
Merge branch 'master' into fns038b
Merge branch 'master' into fns038b
Merge branch 'master' into fns038b
Merge branch 'master' into fns038b
changed encoding for win environment
Merge branch 'master' into fns038b
added cdd func
Merge branch 'master' into fns038b
Merge branch 'master' into fns038b
Merge branch 'master' into fns038b
fixed typo