[#39] Use the keys of the map as list of instances
Merge pull request #40 from akvo/issue/39-config-changes

[#39] Use the keys of the map as list of instances
Merge branch 'develop'