Avoid duplicates
Merge pull request #134 from mehere/dev-wee

Avoid duplicates