Basic comments support (fixes #22)