Further compatibility with fsi/resource-repository-bundle ~1.1
Merge pull request #22 from chives/dev

Further compatibility with fsi/resource-repository-bundle ~1.1