Fix duplicate issue
Merge pull request #12 from GotoLink/patch-1

Fix duplicate issue
Merge remote-tracking branch 'upstream/master'