[#433] Done
Merge pull request #447 from akvo/feature/433

[#433] Done