Added choice of output attributes
Merge remote-tracking branch 'origin/master'