Add currentPage property feature
Merge branch 'Feature/currentPageProperty'