Handling duplicates

#8