Added option to allow empty comment lines