note some tasks right in files
Merge remote-tracking branch 'origin/master'