#240
Merge pull request #319 from rhsu/240

#240
Merge branch 'master' into duplicateCreation