Merge branch 'master' into 'master'

Fix #48 + bugfix in {% tag %}

See merge request !19
2 jobs for master in 7 minutes and 51 seconds (queued for 1 second)