Added simple support for comments