Use static counter to avoid duplicates
Merge pull request #236 from davedevelopment/use-static-counter

Use static counter to avoid duplicates