Added comment capability ( Fixes #1 )