Updated to reflect changes in directives
Merge branch 'master' of https://github.com/davehull/Kansa