Resolves issue #67