Added support for comments.