Added comment support, using C/Java comments