Fix: line endings
merge with master; resolve line issues
merge recents
merge newest changes
Merge pull request #13 from beautyjoy/lines

Lines