Fixing issue #53 - in progress