[#298] [#305] Fixed
Merge pull request #306 from akvo/feature/298

[#298] [#305] Fixed