More additions, function compressions, etc.
Merge remote-tracking branch 'origin/master'
More additions, function compressions, etc.