Pages refactoring
Merge pull request #4 from GoldRenard/pages-refactoring

Pages refactoring