fix delay of page
Merge branch 'master' into dannyg
resolve conflicts of merge
Merge pull request #10 from theklr/dannyg

Dannyg