Solve issue #40

To do still:
- [ ] fix issue #1 and merge into fuzzyfox/nunjucks

This patch also fixes #41, #42, #26, #29, #30, #31