pagetemplates
code cleanup
Merge pull request #3 from Kunstmaan/pagetemplates

Pagetemplates
Update README.md
fix tests
Merge branch 'master' into 2.2

* master:
  fix tests
  Update README.md
  code cleanup
  pagetemplates