Changes #45

Credits @Cpasmoi & @ingbrzy