#40: first commit for comment feature