minor changes
End of line type changed to UNIX format
Unused
minor changes
Merge branch 'current'