Updated to proper versions.
Fixing up line endings.