Merge two small changes from master to develop

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