add comment about why some args exist
Merge remote branch 'upstream/master'