Resolution of #294 (Rewind functionality)