Modified to reflect new capabilities.
Merge remote-tracking branch 'origin/master'