Fix #58
Fix pagination
Merge branch 'master' into struct-editor