added json output
fixed merge problem
formatted jkson output