Resolves issue #47