Automorphisms of finite p-groups