Added more lines
Added new file
Merge branch 'hotfix'