Fixed untracked files
Merge branch 'eddie'