Resolves issue 46.