Started work on issue #11