Adding play/pause
Merge