added support for comments