Fixed parsing of long options
Merge branch 'ping_args' into maint