Added preserving comments.
Upgraded dependencies.