Added preserveComments option and test