fixed my botched playback merge from 3 months ago
Merge pull request #92 from capilkey/fix-playback-merge

fixed my botched playback merge from 3 months ago