some edits
some more edits
some more edits, line mod
Merge remote-tracking branch 'origin/master'