Merge PR 78 at upstream.