made a few comments and added more correct markers ... because they are awesome
Merge remote-tracking branch 'origin/master'