Resolves issue #12