improvements file end with line creation character and unused classes
Merge remote-tracking branch 'origin/master'