fix right border hides part of words problem
Merge remote-tracking branch 'origin/master'
make file names linux friendly