Resolves issue #9