Added new output format. Few minor changes.