Initial release with comments support