Changes #46

Credits @Cpasmoi & @ingbrzy