Added option to create separate header file, whether to insert a comment or not