Fix seeking and simplify some code
Authored by: Jean-Francois Dockes 2014-03-26
Parent(s): [d39b24]
Child(ren): [c7ef4f]