allow for an extra optional argument
Merge branch 'master' of https://github.com/nitbix/ensemble-testing.git