Fix CS
Normalize line endings (Fix #26)
Update CHANGELOG
Merge branch '2.0'