Added support for multiCapabilities command line args
Merge remote-tracking branch 'origin/master'