Merge https://github.com/Myriie/inedite
Merge https://github.com/Mauviolay/inedite
couture