[#298][#291][#288][#285][#280][#278][#267] Fixed
Merge pull request #304 from akvo/feature/298

[#298][#291][#288][#285][#280][#278][#267] Fixed