Fixed prev/next when reaching end of list (wrap around list)
Merge remote-tracking branch 'origin/master'