some new lines
Merge branch 'dev'