Working on issue #60