Merge pull request #59 from dom-mel/master

Allow strftime placeholder on templates
finally fixed escaping