Started working on issue #12