Solve line endings
Fix errors after merge
Merge pull request #11 from Andreis13/master

Fix errors after merge