Updated empty/comment line treatment