Add issue #49