Fix errors in setup and report for composite feedback
Merge remote-tracking branch 'upstream/master'
Fix experiment - argument list in wrong order
Merge pull request #69 from paidi/master

Minor fixes