Added a new entry.
Added a new entry.
Change line endings.
merged