added support of comments in streams