changes for merging script, including duplcheck (commented out)
Merge remote-tracking branch 'origin/master'

merge with changes made on lxplus