Fixing bug causing dups
Merge pull request #73 from glennblock/dev

Fixing bug causing dups