Started work on issue #15