Bug fixes, added jinja2 library
Merge remote-tracking branch 'origin/master'