Make option parsing work (#575)