Added parsing of -from option