Close #144 : Implement Ryukafalz' recommended changes