Added -o option