Added some comments (from linux box)
Merge remote-tracking branch 'origin/master'