Added some info, worked with formatting
Merge remote-tracking branch 'origin/master'