Add some template tags
Update version
Merge branch 'release/0.4.0' into develop