Changed arguments parsing to support -omega & -tau