Merge pull request #247 from dnskr/fix-duplicate-resources