[#391][#392] Done
Merge pull request #443 from akvo/392/feature

[#391][#392] Done