more comments, less packages, working [END] key
Merge remote-tracking branch 'origin/master'