Add line-wrapping
Moved system variables to System object
Removed indentation in body.
Merge remote-tracking branch 'origin/master'