checking DUID in options: 1 and 2
some "style" changes
Merge remote-tracking branch 'origin/master'