Added pretty printing support and partial fix for #3