added Prettify
merge