CS (eof_ending)
CS (trainling space)
Merge branch 'refs/heads/lyrixx-cs'