Merged in efritz/convey/env-loop (pull request #21)

Fix infinite env mapping loop

Fixes #124