Fix next/prev methods
Fix next/prev methods
Merge branch 'master' into github