Added -t option and use of "-" as input