Fixed parsing empty strings causing segfault
Add support generating pretty printed json
Merge branch 'prettyprint'