Bugfix on page change
Merge pull request #148 from andhieka/working

Bugfix on page change