Revert "Revert "Issue #274 completed""

Reverts EricpolUkraine/Ajour#278