Polished playback functionality
Merge pull request #1 from dyzhu12/master

Polished playback functionality