To issue #254 - finished