rebased old fix for allowing new line comment