Another fork of grido due to a pull request