Fixed pagination
Merge branch 'development'