Code review https://github.com/TouK/sputnik/pull/44