Add issue #53