Implementando #233, ping @m4tu5