fixed new lines
Merge branch 'feature'