Began working on issue #114