linking for the pages works
Merge origin/master