merge fix
restore main.pl
Merge branch 'hotfix/v1.0_merge_fix'