Added comment support (via '!')