Added basic support for comments