Resolves issue #126