Fixed issue #1 (Exception on end of playback).
Merge remote-tracking branch 'origin/master'