added json pretty print
Merge branch 'dev'