** Fixed issue #54