added "rewind" feature
Merge branch 'develop'