Based on spf13
Correct problems with line endinds
set encoding
Merge branch 'spf13'