Fix a typo
Files headers clean up
Merge pull request #19 from MBonevil/master

Small fixes