Implementation of the new comment feature (fixes #130)