Merger changes from Samba version. Added play feature (experimental).