Added a -o option (needed for mirari)