Added -f, -h options