Working on issue #75
Work in progress