Added line comment support and removed restriction on trailing pair seperators