Page module update
Merge pull request #1000 from sexnothing/develop

Page module update