Fixed page count in case of imported entries
Fixed page count in case of imported entries
Merge branch 'master' into gh-pages