Merge pull request #21 from chives/dev

Compatibility with fsi/resource-repository-bundle 1.1.*
Further compatibility with fsi/resource-repository-bundle ~1.1