added skipping of comments