Started work on issue #26