Ported to grido 0.9.3 (close #91)