Added more formats
Merge pull request #179 from WouterJ/more_formats

Added more formats (mostly templating)