JOJ16: Add ancils and extra parameters
Merge remote-tracking branch 'remotes/origin/master' into joj16
Make dodc path correct for output data
Merge remote-tracking branch 'remotes/origin/joj16'