refs #711 - better cli arguments parsing

fixes regression introduced by 8b41b70055f43e2e004951762472fb3af0235305