Merge pull request #139 from Ferada/small-fixes

Fix MAP-FOR-IN/DO-SYMBOLS..., add TERPRI.