Added automatic updating