Merge pull request #1 from robertvazan/line-endings

Fixed line endings
Merge remote-tracking branch 'remotes/upstream/master'