removed unused code
added check for duplicating elements
Merge remote-tracking branch 'origin/1.3.0ver' into 1.3.0ver