fix line endings
Merge pull request #33 from eikemeier/master

Thanks Oliver. Merged.
Merge pull request #3 from readium/master

Merge upstream commits