Resolves issue #218