Merge pull request #56 from molinaro-m/no-unique-resource

Merge pull request #56 from molinaro-m/no-unique-resource #12