Added comment support #7