Convert line breaks from CR (Windows) to native. 

<em>This pull is based on and includes #12 to avoid merge conflicts. Once #12 is merged, this will automatically appear as a single-commit pull.</em>