Better support for multiple resources
Bump version: 2.0.5 → 2.0.6
Merge branch 'develop'