Added validation on name and website.
Merge branch 'work'