back and next methods
Merge branch 'master' into ebrehault-back-next