Resolves issue #4