Adding support for comments (v0.1.1)