Added some more conditions to jinja2 template (#51)