Merge two small changes from master to develop

1. fixing command line changes (-e to -s)
1. tweaking HTTP protocol language