Changed option parsing in calling module so it is clearer to users