Added patched version of beautifier from JoseGocalves