JSON output added
HTML output formatting improved