Prevent Duplicates

Close #1