from T-Macgnolia's git