Merge pull request #35 from roignac/master

Playback fixes