Resolves issue #24