added name form main template
and commandline usage