Github issue #29