refactoring for usage with pagekit
Merge branch 'release/2.1.0'

Conflicts:
	composer.json