Added 2 changes

Added:
1.In addition to the commenter, the Comment message to the formatter
class

Modified:
1.Since & until are now operational