Added parsing of comments.