fixes / merge / line ending

please merge!

maybe we can merge without conflicts at some point... :-/